Merge "Cleanup state properly when interacting during gesture nav transition" into sc-dev am: b13200c6b1

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

Change-Id: I305f899a5f8b9322f87ee14bbb9cae90947c5de6