Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev am: 7da025f142 am: bcbd1f8110
am: 4416c7e1ca

Change-Id: I23f1976378b29068448ba40c3d67b98ebe12db55