Thread: apply pathc for #8931.
Thread: Add mutex() to upgrade_to_unique_lock (#8891).