Merge "Fix bug 3381275 - Too much padding on the left of a custom nav bar" into honeycomb