Merge "Do not abort if we fail to allocate a thread-peer on shutdown"