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