11x backport

nicxvanrequested to merge
issue/drupal-3580152:3580152-theme-settings11x into 11.x

Closes #3580152

Merge request reports