Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev