Merge "Fix a bug that could cause improper detection of long press selection mode in WebView after a scale gesture"

core/java/android/webkit/WebView.java

@@ -4872,6 +4872,7 @@ public class WebView extends AbsoluteLayout
             if (detector.isInProgress()) {
                 mLastTouchTime = eventTime;
                 cancelLongPress();
+                mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
                 if (!mZoomManager.supportsPanDuringZoom()) {
                     return true;
                 }