Merge "API review: WallpaperManager" into nyc-dev