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

Change-Id: I3060ebf5980ead55c078e9ab6bcace9fc24d790a