Issue #3436799: Decorate plugin.manager.extra_field_display service instead of creating plugin.manager.extra_field_plus_display
Closes #3436799