Merge commit 'ef204454322238ab91cec6358a646e4de7352a95' * commit 'ef204454322238ab91cec6358a646e4de7352a95': Disambiguation between multiple pointers and swipe gestures.
Merge commit 'ef204454322238ab91cec6358a646e4de7352a95' * commit 'ef204454322238ab91cec6358a646e4de7352a95': Disambiguation between multiple pointers and swipe gestures.