Merge "Add ic_external_display and use it for HDMI" into main