Merge "Clean up CalendarView docs and annotations"