Merge "Fixing touch events ignored in some cases" into sc-dev