Merge "hwc: Add support for HDMI as Primary display"