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