Merge "Make sure that threads are cleaned up by OldThreadGroupTest"