Merge "NSB: cancel all queue join threads"