Merge Timerupdates into main

[jessp]

Adds animated clock while timer is on Prevents user from starting new timer while existing timer is running