Merge "Rework action bar menus." into honeycomb