Merge "Revert "Revamp of the NumberPicker widget.""