Merge "Handle display hotplug errors" into main