Fix constructor argument mismatch when Messenger service is decorated

starlight-sparklerequested to merge
issue/eca-3579628:3579628-exception-when-resolving into 2.1.x

Closes #3579628

Merge request reports