Use special logic for entity displays

Adam G-Hrequested to merge
issue/drupal-3481695:3481695-entity-method into 11.x

Closes #3481695

Merge request reports