Merge "Fix race condition on exit."