Merge "Vsyncs are hard" into lmp-mr1-dev