Merge "Revert "Revert^2 "Cancel gestures on launcher destroy""" into tm-qpr-dev am: 7d346bf9

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



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