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

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

Change-Id: I295a8abd44e8418d1393f606042c9340893a7057