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

Change-Id: I52cf76707b3273aa92d566487189db2a593bedaa