Merge "Fix race in thread list destructor"