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

Change-Id: I31d9b51c1299564546a61a708f2058a815dd2974