Merge "Restore wallpaper positioning between apps." into klp-dev