Merge "Remove units in CountingTimerView" into ics-ub-clock-amazon