Merge "Allow config.xml to set the default display's default color mode" into cw-f-dev am: 7da025f1 am: bcbd1f81 Change-Id: I6c85c5ff922eee94a2d61f7d4c92523d322d1881