Merge "Fix bug 5183775 - Action bar custom layouts with default gravity misbehave"