Merge "Updating current page when changing the frescroll mode" into ub-launcher3-calgary

am: b8b070c

* commit 'b8b070c2dfb27d9ba168c45dd5503e89035a1139':
  Updating current page when changing the frescroll mode

Change-Id: Id9e9f799d4296d5895e01a702c2edc26bc583f27

src/com/android/launcher3/PagedView.java

@@ -1565,6 +1565,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
             } else if (getCurrentPage() > mTempVisiblePagesRange[1]) {
                 setCurrentPage(mTempVisiblePagesRange[1]);
             }
+        } else {
+            setCurrentPage(getPageNearestToCenterOfScreen());
         }
 
         setEnableOverscroll(!freeScroll);