Merge "Merge "Update wallpaper offset when changing target from null" into sc-dev am: ccdb324274 am: a1d274c92a" into sc-qpr1-dev-plus-aosp