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

Change-Id: Ida223a2af7a0669cf495bac8ccb8fa90414d159d