Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf

src/com/android/launcher3/Workspace.java

@@ -2114,7 +2114,6 @@ public class Workspace extends SmoothPagedView
             enableFreeScroll();
         }
 
-
         if (state != State.NORMAL) {
             if (stateIsSpringLoaded) {
                 mNewScale = mSpringLoadedShrinkFactor;