Merge "Fix overview scroll triggering haptics on swipe up gesture" into sc-v2-dev