Merge "Fix overview scroll triggering haptics on swipe up gesture"