am 2c9f86aa: am 53af1cd3: Merge "Vsyncs are hard" into lmp-mr1-dev

* commit '2c9f86aa21b8d7ea6a77eaca9a49ccdb31245129':
  Vsyncs are hard