Merge "Scale wallpaper crop to device-suitable size" into nyc-dev