Merge "Bug 4588114 - Make GestureDetector behave nicer with parallel multi-touch detection"