Merge "Don't clobber in progress page transition in applyLoadPlan()" into sc-v2-dev am: 36e5f812d5 am: 19ce4e2586

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

Change-Id: I0a9facc24dd47b4463a0b3872b3bdef7eb94def0