Fix tap event fallback

Previously the click event callback was called before mouseup which
led to JS errors.

Change-Id: I3c31199fb1d7d3a5eec26efd20aca4551700d63a
Merge "Fix tap event fallback"