Merge "Fix WallpaperManager APIs" into nyc-mr1-dev