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

* commit '3fe68e14b066f0238f12c4920becc8781d8ade5b':
  Fix top level menu lingering when submenu opens.

Change-Id: I1ede9d53699c8fe82f6e893af3dca157c47dc5c4