Merge "Improve touch event resampling." into jb-dev