Merge "Fix alarm expanding issues." into ics-ub-clock-amazon