Merge "DatePicker is picking the wrong date" into honeycomb