Merge "Fix WallpaperInfo API review" into nyc-mr1-dev