am 9580af6d: Merge "Distinguish between menus in ActionBar and popup." into lmp-preview-dev

* commit '9580af6dbcb59427ca03efb8f5744101dd6efa32':
  Distinguish between menus in ActionBar and popup.