Merge "EDID support for external display hotplug"