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

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

Change-Id: I7f02d9d35b861955d8bbf4591f62b7060f37ec59