Fix issue with cancel destroying the picker.
Fix issue with OK properly reading the default date.