Merge "Fix top level menu lingering when submenu opens." into nyc-dev