Merge "Handle empty/unspecified crop properly in wallpaper restore" into nyc-mr1-dev