Merge proposals dependent on lp:~ubuntu-clock-dev/ubuntu-clock-app/stopwatch-feature-staging

1. stopwatch-feature-staging
2. Dependent merge proposals