diff --git a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
index 4a3bf10..121d2de 100644
--- a/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
+++ b/core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php
@@ -54,8 +54,10 @@ public function execute() {
     // display, and arguments should be set on the view.
     $element = $this->view->render();
     if (!empty($this->view->result) || $this->getOption('empty') || !empty($this->view->style_plugin->definition['even empty'])) {
-      return drupal_render($element);
+      return $element;
     }
+
+    return array();
   }
 
   /**
diff --git a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
index 2c0481e..270ed26 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Block/ViewsBlock.php
@@ -11,6 +11,7 @@
 use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
+use Drupal\Component\Utility\Xss;
 
 /**
  * Provides a generic Views block.
@@ -74,14 +75,11 @@ public function form($form, &$form_state) {
    */
   public function build() {
     if ($output = $this->view->executeDisplay($this->displayID)) {
-      $output = $this->view->executeDisplay($this->displayID);
       // Set the label to the title configured in the view.
-      $this->configuration['label'] = filter_xss_admin($this->view->getTitle());
+      $this->configuration['label'] = Xss::filterAdmin($this->view->getTitle());
       // Before returning the block output, convert it to a renderable array
       // with contextual links.
       $this->addContextualLinks($output);
-
-      $this->view->destroy();
       return $output;
     }
 
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index 1e59e22..25c387e 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -1333,7 +1333,7 @@ public function render($display_id = NULL) {
   public function executeDisplay($display_id = NULL, $args = array()) {
     if (empty($this->current_display) || $this->current_display != $this->chooseDisplay($display_id)) {
       if (!$this->setDisplay($display_id)) {
-        return FALSE;
+        return NULL;
       }
     }