Merge "Avoid fake high input latency while vsync drifting"