Merge "Fix stress runner exit issues"