Merge "Fix activity transitions" into ics-ub-clock-amazon