Merge "Fix unnecessary touch event handling"