Merge "Merge \\\"Avoid re-calculating vsync mid-frame\\\" into nyc-dev am: fc275d244e am: 2d30d67249 am: 56906e38c9"