Merge "Respect legacy color mode settings" into oc-mr1-dev