Merge "Revert "Cancel gestures on launcher destroy"" into tm-qpr-dev