Merge proposals dependent on lp://qastaging/~ibelieve/ubuntu-clock-app/initial-convergent-layout

1. initial-convergent-layout
2. Dependent merge proposals