* commit 'e4aa31382139ee2e319110fbfff402e0c6315952': Distinguish between menus in ActionBar and popup. [DO NOT MERGE]