Merge "WallpaperColors refactor" into oc-dr1-dev