Merge changes I05a42795,Ibe230906

* changes:
  SF: Decouple VsyncModulator from Scheduler
  SF: Rename VsyncModulator