Merge "Enable WCG support for ImageWallpaper"