Merge "Fix bug 5179524 - ActionBar custom view inflation doesn't catch layout_gravity"