diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 6308d97..9726658 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -882,22 +882,6 @@ function user_menu() {
 }
 
 /**
- * Implements hook_local_actions().
- */
-function user_local_actions() {
-  return array(
-    array(
-      'route_name' => 'user_admin_create',
-      'title' => t('Add user'),
-      'appears_on' => array(
-        'user_admin_account',
-        'view.user_admin_people.page_1',
-      ),
-    ),
-  );
-}
-
-/**
  * Implements hook_menu_link_presave().
  */
 function user_menu_link_presave(MenuLink $menu_link) {
diff --git a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php b/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
index 455eed6..9005d89 100644
--- a/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
+++ b/core/modules/views/lib/Drupal/views/EventSubscriber/RouteSubscriber.php
@@ -44,10 +44,10 @@ public function __construct(EntityManager $entity_manager) {
   }
 
   /**
-   * Reset the internal state of the route subscriber
+   * Resets the internal state of the route subscriber
    */
   public function reset() {
-    unset($this->viewsDisplayPairs);
+    $this->viewsDisplayPairs = NULL;
   }
 
   /**
@@ -66,6 +66,7 @@ protected function getViewsDisplayIDsWithRoute() {
     if (!isset($this->viewsDisplayPairs)) {
       $this->viewsDisplayPairs = array();
 
+      // @todo Convert this method to some service.
       $views = views_get_applicable_views('uses_route');
       foreach ($views as $data) {
         list($view, $display_id) = $data;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayRouterInterface.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayRouterInterface.php
index fa228d9..834514d 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayRouterInterface.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayRouterInterface.php
@@ -27,6 +27,11 @@
   public function collectRoutes(RouteCollection $collection);
 
   /**
+   * Alters a collection of routes and replaces definitions to the view.
+   *
+   * Most of the collections won't have the needed route, so by the return value
+   * the method can specify to break the search.
+   *
    * @param \Symfony\Component\Routing\RouteCollection $collection
    *
    * @return bool
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
index fdd4c16..f0578fd 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/PathPluginBase.php
@@ -23,6 +23,13 @@
 abstract class PathPluginBase extends DisplayPluginBase implements DisplayRouterInterface {
 
   /**
+   * The route provider.
+   *
+   * @var \Drupal\Core\Routing\RouteProviderInterface
+   */
+  protected $routeProvider;
+
+  /**
    * Constructs a PathPluginBase object.
    *
    * @param array $configuration
@@ -32,7 +39,7 @@
    * @param array $plugin_definition
    *   The plugin implementation definition.
    * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
-   *   The route provider
+   *   The route provider.
    */
   public function __construct(array $configuration, $plugin_id, array $plugin_definition, RouteProviderInterface $route_provider) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
@@ -93,7 +100,7 @@ protected function defineOptions() {
   }
 
   /**
-   * Generate a route entry for a given view and display.
+   * Generates a route entry for a given view and display.
    *
    * @param string $view_id
    *   The ID of the view.