Theme Installer: Combine 'Layout' and 'Columns' filters so 'Features' can span two columns.

see #27055.

Built from https://develop.svn.wordpress.org/trunk@28037


git-svn-id: http://core.svn.wordpress.org/trunk@27867 1a063a9b-81f0-0310-95a4-ce76da25c4cd