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