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: Icea54a23541cdd1791d9adc1c5dde67bbd6583c9