Merge "Fixing alignment in the action bar" into honeycomb