Do not call the layout's onInit() method if there is no layout.
Merge branch 'develop' of github.com:octobercms/october into develop