Merge "Fix action bar theme inheritance and icons, make colors public"