Merge "Fix setting a calendar to a time during transition into DST"