Merge "Fix date and alarm showing in landscape hammerhead" into ics-ub-clock-amazon