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