Merge "Revert "SF: Fix deadlock during display hotplug"" into main