Merge "Fix a racing condition in ProcessRecord"