Merge "Avoid re-calculating vsync mid-frame" into nyc-dev