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

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

Change-Id: I7a7f8cb174653518894c53923e10d30ff75e8c72