Merge "Prevent a 4-way binder interlock leading to a leak." into qt-dev
am: f3eaec257a

Change-Id: Iec3ca6984fd9297b3766782d0bcf34dac4c02d82