Merge "Respect legacy color mode settings"