Merge "Fix some touch issues during gesture nav transition" into sc-dev am: 8db306f3c5 am: 9f7eae758f

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

Change-Id: I946b5904be09620c4519b69f20e453d234491b6d