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