Merge "Fix bug 3381563 - fix segmented button styles" into honeycomb