Bug 934220 - [v1.2] Update clock app and tests to be in line with master