Merge "Fix tap detection after a long press"