Add changes from patch...

Add changes from patch https://www.drupal.org/project/layout_options/issues/3449195#comment-15607495

Closes #3449195