Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1