Merge "Disable the two-swipe when quickstep is disabled." into ub-launcher3-master