Merge "NumberPicker does not not fit on Crespo in landscape." into ics-mr1