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

Change-Id: Ic8c5e7e91660b1bc91c1a765d17fe4c905652a11