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

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

Change-Id: I9f601c606f006df32cd0ed015cb75dc0cc442ae6