am f83cd4ec: Merge "NumberPickers in settings now survive device rotations" into ub-deskclock-charm

* commit 'f83cd4ecec038268c5786f1e8ac64492b1213b1b':
  NumberPickers in settings now survive device rotations