Merge "Ensure sane WallpaperData" into nyc-dev