diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index a4119f5..06c6a53 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -289,6 +289,7 @@ public function collectRenderDisplays($entities, $view_mode) {
         // Create a fresh display object.
         $display = entity_get_display($this->entityType, $bundle, 'default');
       }
+      $display->originalMode = $view_mode;
 
       // Let modules alter the display.
       $display_context = array(
diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
index 82827ab..7a52f0d 100644
--- a/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
+++ b/core/modules/block/lib/Drupal/block/Tests/BlockStorageUnitTest.php
@@ -24,7 +24,7 @@ class BlockStorageUnitTest extends DrupalUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'block_test', 'system');
+  public static $modules = array('block', 'block_test', 'system', 'entity');
 
   /**
    * The block storage controller.
diff --git a/core/modules/edit/lib/Drupal/edit/MetadataGenerator.php b/core/modules/edit/lib/Drupal/edit/MetadataGenerator.php
index 8550a0b..6d43b73 100644
--- a/core/modules/edit/lib/Drupal/edit/MetadataGenerator.php
+++ b/core/modules/edit/lib/Drupal/edit/MetadataGenerator.php
@@ -87,7 +87,7 @@ public function generateField(EntityInterface $entity, FieldDefinitionInterface
     }
 
     // Early-return if no editor is available.
-    $render_controller = $this->entityManager->getRenderController($entity->entityType());
+    $render_controller = $this->entityManager->getViewBuilder($entity->entityType());
     $formatter_id = $render_controller->collectRenderDisplay($entity, $view_mode)->getRenderer($field_name)->getPluginId();
     $items = $entity->getTranslation($langcode)->get($field_name)->getValue();
     $editor_id = $this->editorSelector->getEditor($formatter_id, $field_definition, $items);
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index b738ed9..67be719 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -517,7 +517,7 @@ function field_view_field(EntityInterface $entity, $field_name, $display_options
   // Get the formatter object.
   if (is_string($display_options)) {
     $view_mode = $display_options;
-    $render_controller = \Drupal::entityManager()->getRenderController($entity_type);
+    $render_controller = \Drupal::entityManager()->getViewBuilder($entity_type);
     $formatter = $render_controller->collectRenderDisplay($entity, $view_mode)->getRenderer($field_name);
   }
   else {