Combine swipe gestures into a single drag gesture

This makes them more versatile for different kinds of control schemes.
Directional swipes can still be approximated through the Control
interface.  Capturing swipe gestures is no longer easily possible, but
the capture interface is due for a rewrite to support activator controls
anyway.