Merge "Using correct slop for checking quickstep gesture" into qt-dev
am: 6f72636bb6

Change-Id: Ibec1b1cbdca8dbf0bacd18f635ebc1d29c343f14