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

Change-Id: I6ab68f5e681172fc4aa68b0195c1ad36f21cfaf3