Merge "Fix WallpaperPicker not being able to assign colors" into sc-dev