Sweep 21.3.25 into 21.9

This MR sweeps all the changes between 21.3.24 and 21.3.25.

For more details see here: https://gitlab.cern.ch/atlas/athena/-/tags/release%2F21.3.25

I would like to ask @jojungge to help with the muon review as there were some conflicts there.

@tstreble, if this can be related to ITk can you check TrackVertexAssociationTool changes as there were also some conflicts?