Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1