Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev