Merge "Avoid fake high input latency while vsync drifting"
am: 3996c9eb72

Change-Id: I2ec4e9d40b9161a5823e0b87ffe6b576a33ee912