Merge "Fix up layout changes as per redlines." into ics-ub-clock-amazon