Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev