Bug 923438 - [Clock] Refactor button/input interaction

https://bugzilla.mozilla.org/show_bug.cgi?id=923438