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

Change-Id: I0138ac6a799d35737d6625587e25bad513eedde6