Merge "Fix regression with legacy expanded menus"