Merge "Fixes usage of WallpaperManager to make it optional."