Merge "Adopt new ListenerTransport framework"