Merge "hwc: Fixes for HDMI primary/external use cases"