Add new color mode setting
am: 9143fb26b4  -s ours

Change-Id: I0ba85e94b8cbc85868949f1ed9f7d68242e1eb0b