Merge "Ensure mCurrentPage is valid after page is removed" into ub-launcher3-dorval-polish

src/com/android/launcher3/PagedView.java

@@ -926,6 +926,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
     @Override
     public void onChildViewRemoved(View parent, View child) {
         updateFreescrollBounds();
+        mCurrentPage = validateNewPage(mCurrentPage);
         invalidate();
     }