Merge "Add new color mode setting" into oc-mr1-dev