Merge "SF: Use vsync workaround to detect hotplug errors" into main