Merge "Fix bug #2485358 (add more logging to CalendarProvider2)"