Switch to Drupal once, Drupal 10 readiness

Thanks for the testing, the changes here have been merged in.

@vishnukumar I have created a separate issue for Gin compatibility at 🐛 Doesn't work with Gin admin theme Needs review

Automatically closed - issue fixed for 2 weeks with no activity.