Merge "Use TWO_FINGER_SWIPE classification for touchpad scroll events"