Merge "Add ability to select composition color space for a given color mode" into qt-r1-dev
am: b5f152e34d

Change-Id: I29cf3e1645e6a69ac1d8847d54820806a0277d9c