ContainerNotInitializedException: \Drupal::$container is not initialized yet.

Upon updating to 4.0-beta3 (via composer), our site crashes with the error below. Still investigating, but I'm initially assuming it has something to do with #3018331: Install fails if module Menu Trail by Path is installed, as the error references code introduced to ContextServiceProvider.php in that issue. Perhaps a cache rebuild would help, but I can't easily do that as Drush is also failing with a similar error.

We do not use Menu Trail by Path.

The website encountered an unexpected error. Please try again later.
Drupal\Core\DependencyInjection\ContainerNotInitializedException: \Drupal::$container is not initialized yet. \Drupal::setContainer() must be called with a real container. in Drupal::getContainer() (line 130 of /var/www/docroot/core/lib/Drupal.php).
Drupal::getContainer() (Line: 158)
Drupal::service('menu.active_trail') (Line: 19)
Drupal\context\ContextServiceProvider->alter(Object) (Line: 30)
Drupal\Core\DependencyInjection\Compiler\ModifyServiceDefinitionsPass->process(Object) (Line: 140)
Symfony\Component\DependencyInjection\Compiler\Compiler->compile(Object) (Line: 789)
Symfony\Component\DependencyInjection\ContainerBuilder->compile() (Line: 1335)
Drupal\Core\DrupalKernel->compileContainer() (Line: 916)
Drupal\Core\DrupalKernel->initializeContainer() (Line: 477)
Drupal\Core\DrupalKernel->boot() (Line: 707)
Drupal\Core\DrupalKernel->handle(Object) (Line: 19)