am b0736fac: Merge "Fix hiccup when dropping in springloaded mode on large ui" into ics-mr1

* commit 'b0736fac73b0df95f18234a0494aea3f3fc6c735':
  Fix hiccup when dropping in springloaded mode on large ui

src/com/android/launcher2/Workspace.java

@@ -1138,6 +1138,7 @@ public class Workspace extends SmoothPagedView
     }
 
     private void screenScrolledLargeUI(int screenCenter) {
+        if (isSwitchingState()) return;
         boolean isInOverscroll = false;
         for (int i = 0; i < getChildCount(); i++) {
             CellLayout cl = (CellLayout) getChildAt(i);