Merge pull request #17304 from mcav/timerrest

Bug 982789 - [B2G][Clock]Set Timer intermittently starts countdown at incorrect starting point. r=millermedeiros
Conflicts:
	apps/clock/js/panels/timer/main.js
	apps/clock/test/marionette/timer_test.js