Merge "HWC2: Add support for color modes am: 076ac67026 am: 91ea3c08bc am: 6f9e0e0984"