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