Merge "Revert^2 "Cancel gestures on launcher destroy"" into tm-qpr-dev am: 74484f4a99 am: 86fbe3c7ea

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

Change-Id: I8c6e5b7431631ce5577dc6ba8435d607fc3bc883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>