Merge "Fix typo in CalendarView style docs" into nyc-dev