Issue #3375154: \Drupal calls should be avoided in classes, use dependency injection instead

Closes #3375154