Merge "Fix issue #6706369: Sometimes the "App info" popup shows..." into jb-dev

packages/SystemUI/src/com/android/systemui/SwipeHelper.java

@@ -322,6 +322,9 @@ public class SwipeHelper implements Gefingerpoken {
         }
 
         if (!mDragging) {
+            // We are not doing anything, make sure the long press callback
+            // is not still ticking like a bomb waiting to go off.
+            removeLongPressCallback();
             return false;
         }