Reorganize the handling of tap inputs.

Reorganize the handling of tap inputs.

This change fixes bugs concerning the transition into the hold/drag state
after double taps or two- or three-finger taps.  In addition, it ensures
that button events properly match the logical button state when tap inputs
and button inputs overlap.