Merge "Re-style stopwatch notification to match that of timer." into ub-deskclock-charm