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