[automerger skipped] Merge "Prevent a 4-way binder interlock leading to a leak." into qt-dev am: f3eaec257a
am: 929210b213 -s ours
am skip reason: change_id Ide2428dab3fcd6d7cd00aa2a9fd99d6c99b815a4 with SHA1 d5603307e1 is in history

Change-Id: Ibc28983759c80ae21756e7a3c03b9db7aae285d8