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

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

Change-Id: If3a78711b88b9777e67b3a4fbb9de821d5d9e192