Merge "Reducing the touch slop for quickstep" into pi-dev