Start of using layout_plugin
Merge branch '8.x-2.x' into layout_plugin
Switch all to new layout manager.