Frontend: Merged Changes - Cancel Timer