[BUG #8642] fix for touch events
minor lint fix
Minor
Merge remote branch 'upstream/master'