Merge proposals dependent on lp://staging/~dylanmccall/gnome-activity-journal/calview-scrubbing

1. calview-scrubbing
2. Dependent merge proposals