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