Merge proposals dependent on lp:~artmello/ubuntu-calendar-app/ubuntu-calendar-app-adaptive_layout

1. ubuntu-calendar-app-adaptive_layout
2. Dependent merge proposals