Merge "Fixing another crash when creating/updating BLASTBufferQueue"