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

Change-Id: I46fa4328214c20c5c907df83378dc93466178e19