Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1