Merge "Fix top level menu lingering when submenu opens." into nyc-dev
am: 7ce082a

* commit '7ce082a46259e948e4ea6a12f327f32aecaf167a':
  Fix top level menu lingering when submenu opens.

Change-Id: I994fe5fa29f9b10c0d7a8e4dd306fe2e4f35df7e