Merge "Merge "WallpaperColors refactor" into oc-dr1-dev am: 04d2ec59e8" into oc-dr1-dev-plus-aosp