Merge "Revamp of the NumberPicker widget."