Merge "SF: Propagate display hotplug errors" into main