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

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

Change-Id: Ib1839eb9ec26b05e563253639cf1067911013b78