Merge "Add ability to select composition color space for a given color mode"...
Merge "Add ability to select composition color space for a given color mode" into qt-r1-dev am: b5f152e3
am: 9ab8dbeb
Change-Id: I80f5afdd263a6dc2176df5444a265d9035a148b4