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