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

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);