Re rolling patch to 11.x

Amey Mudrasrequested to merge
issue/drupal-3192130:3192130-switch-to-border-box into main

Closes #3192130

Merge request reports