Merge "Don't allow swipe up for all apps above shelf" into ub-launcher3-master