Drupal 11 compatibility fixes

Blas Olivarequested to merge
issue/switch_page_theme-3489081:3489081-d11-compatibility into 4.0.x

Closes #3489081

Merge request reports