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

Change-Id: Iaac0f0dbeb5dc522074f14050e59471859856c10