Merge "Dispose of TransportClient in updateStateForTransport()"