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

Change-Id: I79fe602bf5e27608b343e926e098a6e73326ad3a