Merge "transactions: fix mutex deadlock on layer death" into qt-dev
am: 1db00e0af0

Change-Id: I009654a8678a1d0c36474c7e0856cbde384d7b3d