Merge branch 'upgrade/reco' into 'master'

Run the same set of components for Run 4 reco as for Run 2 reco

See merge request atlas/athena!48337

Reconstruction/RecJobTransforms/python/RecoSteering.py

@@ -43,7 +43,6 @@ def RecoSteering(flags, tryConfiguringAll=False):
         elif flags.Detector.GeometryITk:
             from InDetConfig.ITkTrackRecoConfig import ITkTrackRecoCfg
             acc.merge(ITkTrackRecoCfg(flags))
-            return acc  # stop here for now with ITk
         log.info("---------- Configured tracking")
 
     # muons