Resolve #3564234 "Backport display"

Stephen Mustgraverequested to merge
issue/drupal-3564234:3564234-backport-display into 11.x

Closes #3564234

Merge request reports