am 5fecbf9d: am ec586994: Merge "CalendarView header not updated on year change." into jb-mr2-dev

* commit '5fecbf9d10cd6e40204187e6a2970ed113e48350':
  CalendarView header not updated on year change.