Merge "Merge "WallpaperColors caching and synchronization" into oc-dr1-dev am: bd17b31310 am: 3f8a36052b"