Merge "DatePicker does not respect the user preference of date format"