Merge "Ensure seq_cst memory ordering for num_contenders"