Resolve #2958478 "Toolbar height calculation"

Michael Strelanrequested to merge
issue/drupal-2958478:2958478-toolbar-height-calculation into main

Closes #2958478

Merge request reports