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

Change-Id: I97fb37429e97c59b223a36431f59c43c86c92ab0