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

* commit 'b53e4c4a3879b0a3e649e62a07734643ee3122ae':
  Revert "Fix various bugs in DatePickerCalendarDelegate"