am 4661a05b: am 2f504d9e: Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1

* commit '4661a05bef8c98b18698202c758067ac9c965f77':
  NumberPicker incorrectly shown for the old theme.