Merge "Check for null mBlastBufferQueue" into rvc-dev