Merge "Use correct date pattern for displaying year in DatePicker" into oc-mr1-dev