Merge "Snap to destination page before animating folder close." into sc-dev

src/com/android/launcher3/folder/Folder.java

@@ -745,6 +745,10 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo
         if (mIsAnimatingClosed) {
             return;
         }
+
+        mContent.completePendingPageChanges();
+        mContent.snapToPageImmediately(mContent.getDestinationPage());
+
         if (mCurrentAnimator != null && mCurrentAnimator.isRunning()) {
             mCurrentAnimator.cancel();
         }