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

Change-Id: Ie17d775ca17a40859970af899eda3e47e605d311