Merge "Fix bug 4136071 - CAB causes the action bar to be shown, regardless of previous state"