Resolve #3624761 "Revert navigation top entity override"

Jean Valverderequested to merge
issue/display_builder-3624761:3624761-revert-navigation-top-entity-override into 1.0.x

Closes #3624761

Merge request reports