Merge "Ensure TouchSessions are always removed." into tm-qpr-dev