Going back to touchDragged/Up always being handled.

#1481
Merge branch 'origin/master'