Merge "TouchInteractionController: allow state transitions from STATE_DRAG."