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