Merge "Support -Wthread-safety for BLASTBufferQueue_test" into main