Merge "Handle OOME during threadstress finishing message"