Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev