Merge "Two state swipe interaction fixes" into ub-launcher3-master