Merge "Fix CalendarView to show the right month and year label." into jb-mr2-dev