Merge change 24395 into eclair

* changes:
  Make NumberPicker subclassable