Applies main branch patch to 11.x

Matthew Radclifferequested to merge
issue/drupal-3359511:3359511-regression-missing-menu-11.x into 11.x

Closes #3359511

Merge request reports