Merge "Fix SwipeDetectorTest" into ub-launcher3-master