Merge "Fix bug 5189070 - Don't try to show overflow popups for nonexistant menus"