Merge "Don't send an ontouchmove until slop is exceeded" into jb-dev