Merge "Fix extra haptic on swipe up" into sc-dev