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

* commit 'a49c3585762ab7543d1f2445a7460d26ccb51538':
  Fix CalendarView to show the right month and year label.