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

Change-Id: I113891d2681f25b44bd1a71a4cc072103eecb102