Merge "Introduce PictureColorModePreferenceController"