Merge "Add theme style flag to WallpaperColors" into oc-dr1-dev