Merge "Remove hard-coded colors in Wallpaper Picker" into sc-dev