Merge "Fix XML serialization of WallpaperColors" into sc-dev