Merge "Merge \\\"Avoid re-calculating vsync mid-frame\\\" into nyc-dev am: fc275d24 am: 2d30d672 am: 56906e38"