Merge "bridge_roles: Use a non-locking linked list where appropriate"