Merge "Fixed a bug where the current wallpaper could be reset on an update"