[BUG #8421] Swipe does not fire when target changes
* Moved preventing gesture logic to work only for tap gesture.