Merge branch '1.x'
Disabled Timer Mechanisms

Although the timer switch and label were hidden, this minor fix
disables those switches in case a user were to accidentally trigger
those functions.
Merge branch 'master' into 1.x