Merge "Using correct slop for checking quickstep gesture" into qt-dev