Merge "Fix a bug when showing the menu panel with an action bar/menu items present."