Merge "Do less work holding thread list lock"