Merge "SF: Move hotplug dispatch to Scheduler" into main