Merge "HDMI: Avoid NPE on Hotplug In" into main