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