Bug 923438 - [Clock] Refactor button/input interaction