Backport

Stephen Mustgraverequested to merge
issue/drupal-3578196:3578196-backport-media-links into 11.x

Closes #3578196

Merge request reports