Merge "Ignore ?attr/windowActionBar when displaying menus"