Merge "Don't show icons for top level menus unless forced." into nyc-dev