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

* commit '2f504d9ea8aa18cd8dbaa2dcc3f3959252b414cc':
  NumberPicker incorrectly shown for the old theme.