Merge "Use higher default thread suspend timeout for run tests"