Merge "Drain any pending touch events immediately if possible" into jb-dev