Merge "fix(bakery_lock): add __unused for clang" into integration