Merge "Add color mode setting" into oc-mr1-dev
am: 19aa8ae955

Change-Id: I99821d20c99ae46537640cde4418c9079a46f6f1