Merge "Day numbers in CalendarView have incorrect size." into jb-mr1-dev