Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev am: 679f8bb9ca

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15175270

Change-Id: I4cc43374c577299c7be3d63bb8a7393a90447231