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