Context

Backport of !7933 (merged) - Fix await_protocol_activation that does not wait anymore

Manually testing the MR

git cherry-pick 070b70cd5339d039cff860fd1d9c0afcce1cc4af

Document the interface of any function added or modified (see the coding guidelines)
Document any change to the user interface, including configuration parameters (see node configuration)
Provide automatic testing (see the testing guide).
For new features and bug fixes, add an item in the appropriate changelog (docs/protocols/alpha.rst for the protocol and the environment, CHANGES.rst at the root of the repository for everything else).
Select suitable reviewers using the Reviewers field below.
Select as Assignee the next person who should take action on that MR