Merge "Fixing small regression where dropping from a folder causes the search bar to flash."

src/com/android/launcher2/Launcher.java

@@ -2304,6 +2304,8 @@ public final class Launcher extends Activity
     }
 
     void exitSpringLoadedDragModeDelayed(final boolean successfulDrop, boolean extendedDelay) {
+        if (mState != State.APPS_CUSTOMIZE_SPRING_LOADED) return;
+
         mHandler.postDelayed(new Runnable() {
             @Override
             public void run() {