Display timer state in UI again
Merge branch 'master' into builds
7.655