Merge "Fix WallpaperManager APIs"