Merge "Reset the color settings if the wallpaper changes" into sc-dev