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