Apply patch 2667396 #21

Andrew Mortonrequested to merge
issue/drupal-2667396:2667396-make-the-toolbar into main

Closes #2667396

Merge request reports