Merge "Revert "Fix some touch issues during gesture nav transition"" into sc-dev am: c48d40475b am: 130d69b8bb

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

Change-Id: I28bc0c36585559e4e51ffc54a48b024a181641f2