Merge "Using FallbackSwipeHandler in 2-button mode" into ub-launcher3-master