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

see #27055.


git-svn-id: https://develop.svn.wordpress.org/trunk@28037 602fd350-edb4-49c9-b593-d223f7449a82