Merge "Add new color mode setting" into oc-mr1-dev am: 94aa05059d
am: c892a3cfc9

Change-Id: I971cf848dd70597c97270a008912c099c6bd24db