Merge "Revert "Use GestureDetector in WorkspaceTouchListener"" into ub-launcher3-master