Resolve #3582690 "Shortcut themes attempt2"

Stephen Mustgraverequested to merge
issue/drupal-3582690:3582690-shortcut-themes-attempt2 into main

Closes #3582690

Merge request reports