Merge "Fix action bar theming"