Merge "hwc2: Fix color mode setting"