am 0ddc899d: Merge "Fix bug 5189070 - Don\'t try to show overflow popups for nonexistant menus"

* commit '0ddc899dc5f2acebb1daa19369dbfe81d257690d':
  Fix bug 5189070 - Don't try to show overflow popups for nonexistant menus