Merge changes Ieea13661,I05b66a4e

* changes:
  SF: Move ownership of VsyncModulator to Scheduler
  SF: Extract VsyncConfig to its own header