Merge "p2p: Close the channel when onStop is called." into tm-dev