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

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

Change-Id: I791b755d46acef1e85e1904377df0c0ba0428b07