ActionBar support and changes needed for supporting rebrand