Merge changes Ibb632d4a,I95939670

* changes:
  SF: pass a render rate to VsyncTracker instead of a divisor
  SF: vsync divisors should use the same reference point