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

Change-Id: I909f0cc2e32ba44664e88046529cc626a81c8a31