am 98672681: Merge "Fix race in thread list destructor"

* commit '9867268143038e6037c80d4aaaca9a94d538ac01':
  Fix race in thread list destructor