refactored/fixed uicatalog/gestures tests
Merge pull request #2622 from sebv/master

Refactored/fixed uicatalog/gestures tests
ci android branch for build #4490.3