Load AV::Layouts dynamicly via railties

actionpack/lib/action_controller/base.rb

@@ -210,7 +210,6 @@ module ActionController
     end
 
     MODULES = [
-      ActionView::Layouts,
       AbstractController::Translation,
       AbstractController::AssetPaths,
 

actionpack/lib/action_controller/metal/streaming.rb

@@ -193,8 +193,6 @@ module ActionController #:nodoc:
   module Streaming
     extend ActiveSupport::Concern
 
-    include ActionView::Rendering
-
     protected
 
     # Set proper cache control and transfer encoding when streaming

actionpack/test/abstract_unit.rb

@@ -268,6 +268,8 @@ class Rack::TestCase < ActionDispatch::IntegrationTest
   end
 end
 
+ActionController::Base.superclass.send(:include, ActionView::Layouts)
+
 module ActionController
   class Base
     include ActionController::Testing

actionview/lib/action_view/railtie.rb

@@ -38,7 +38,7 @@ module ActionView
 
     initializer "action_view.setup_action_pack" do |app|
       ActiveSupport.on_load(:action_controller) do
-        ActionController::Base.send(:include, ActionView::Layouts)
+        ActionController::Base.superclass.send(:include, ActionView::Layouts)
       end
     end
   end

actionview/test/abstract_unit.rb

@@ -268,6 +268,8 @@ class Rack::TestCase < ActionDispatch::IntegrationTest
   end
 end
 
+ActionController::Base.superclass.send(:include, ActionView::Layouts)
+
 module ActionController
   class Base
     include ActionController::Testing