Merge change 24271 into eclair

* changes:
  b/2102011 Fix the problem where multi-day events may appear multiple times in the Agenda view.