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

Change-Id: Ia2d3b7951c03dfa6fdda6e1c88377369cb970717