Merge "Instead of asserting, remove active streams if their sockets return failure"