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

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

Change-Id: I0ddd4dffbc4a8ab8fa2dd3d53712e088e61d0580