Merge "Fix race condition in SError inject test"