`layout` defaults to `none` (`nil`)
Merge pull request #2078 from ZDroid/rm-layout-none

Remove redundant `layout: none`