Merge "BLASTBufferQueue: Fix two conditions leading to freeze." into rvc-dev