Merge "Cancel active Futures/Callbacks if transport dies." into tm-dev