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

Change-Id: I5927ff38f3a34476e089871818b92bff03effa7d