Merge "Fix some issues with the action bar and action modes."