Merge "Avoid race in single thread suspension."