[Bug 2243610] New: use single menu for