Merge "Avoid lock inversion." into qt-qpr1-dev am: f63047c04b

Change-Id: Ifc02610d75c589a1730164ed29ae6f174bb05760