Merge "Fix a couple interactions between action bar and options menus"