Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev