Merge "Avoid lock inversion." into qt-qpr1-dev