Merge "Large clock - Don't allow overlapping animations"