Merge "Ensure mCurrentPage is valid after page is removed" into ub-launcher3-dorval-polish
am: 94e9d53728

Change-Id: I63696e5843f0f49f48c84659d5b8f37a171e63f2