Merge "Don\'t show icons for top level menus unless forced." into nyc-dev am: 0967da3
am: 4f561a4

* commit '4f561a474810d4f770873f199cc5decb0f41089c':

Change-Id: Ib3207bcb09547b486abffa079237252b14d40fcf