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

Change-Id: I186aae898e02fbf36d95a5971fe23247db13a045