Backport to 11.3.x

Stephen Mustgraverequested to merge
issue/drupal-3541910:3541910-backport-navigation into 11.3.x

Closes #3541910

Merge request reports