Merge "blast: fix leak on BufferStateLayer death" into qt-dev