Merge "HWC2: Add support for color modes am: 076ac67026 am: 4b966273d6 am: 8753c43c27"