Merge "Fix frequent gcstress ThreadStress crash"