Merge "Update wallpaper offset when changing target from null" into sc-dev