am 84c5ade8: Merge "Fix vertical scroll computation in NumberPicker" into klp-dev

* commit '84c5ade823d96f6166fad4d6e4521badd322e5e8':
  Fix vertical scroll computation in NumberPicker