Merge "Fix bug 3385930 - Holo.SegmentedButton contentarea and disabled state broken" into honeycomb