Revert "Reverted Andrey's fix of touchclick until we understand more"
Revert "Reverted Andrey's fix of touchclick until we understand more"

This reverts commit b2a5e2e5a83026423f6ec9db0677ecf543a684fb.

AndreyTepaykin/Platform,EGreg/Platform,EGreg/Platform,Qbix/Platform,Qbix/Platform,EGreg/Platform,AndreyTepaykin/Platform,AndreyTepaykin/Platform,EGreg/Platform,AndreyTepaykin/Platform,Qbix/Platform,Qbix/Platform