Merge "Fix some touch issues during gesture nav transition" into sc-dev am: 6348858734 am: e6704c17f2

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

Change-Id: Ie31b8673cadabf99149665f9a7b1a9fb95d953a3