Merge "SF: Set an initial mode in response to hotplug for external displays" into main