Merge "Clean up some Action Bar style handling."