Merge "Fix regression where drag down could start during swipe."