Merge "Cleanup swipe detector in case of double cancel" into ub-launcher3-edmonton