Merge "Move VsyncConfiguration from SF to Scheduler" into main