Merge change 22082 into eclair

* changes:
  Address b/2064664 by setting mThumbOffset to half the width of the thumb by default.