Fix fast clicking handling by checking the type of handler before removing the previously added.

@bug W-2250356@
Merging origin/bob/master-pending/fix-fastclick into master