Merge "Removing dependency on wallpaper colors and using theme resources" into sc-dev