Merge "CalendarView header not updated on year change." into jb-mr2-dev