Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev