Merge "hwc: Fix to find HDR mode"