Merge "Avoid lock inversion."