Merge "Fix vertical scroll computation in NumberPicker" into klp-dev