Merge "Add config value for a11y color mode" into qt-dev am: e18aadd673
am: 230002a6f7

Change-Id: I5473e549e0f67590fbba06fdacbc15ea9109f528