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