Resolve #3577332 "Field entity override follow up"

Jean Valverderequested to merge
issue/display_builder-3577332:3577332-field-entity-override into 1.0.x

Closes #3577332

Merge request reports