Merge "Decouple CalendarView code"