Merge "Fix SocketListener socket leak issue."