Bug 915970 - [Clock] Prepare Stopwatch for persistence