Merge changes I2719e352,I580d3301 into main

* changes:
  SF: Remove Scheduler::resetPhaseConfiguration
  SF: Reset the active display on hotplug reconnect