Merge "Revert "Fix case of gesture being stuck when the Launcher is stopped mid-gesture"" into tm-qpr-dev