Moved functionality related tap event handling in onTouch() handler.