Merge "hwc2: Fix HDR api issues"