Overflow popup menu may be null when overflow menu button is not null

When updating options menu, if mOverflowMenuButton was not null, we
skip intialization of mOverflowPopupMenu, causing mOverflowPopupMenu to
stay null. This caused issues on rotation.

Ticket FEIJ-241

Change-Id: I3dc050ffdc3c85e8ccca08ed99943f15ec915856
(cherry picked from commit 5f5b6adf)