Merge "Revert action bar theme attribute"