[TIMOB-13774] Fixed merge conflicts.
Merge pull request #4503 from cb1kenobi/timob-13774_3_1_X

[TIMOB-13774] Added tiapp.xml setting to allow or disallow touch events...