Merge proposals dependent on lp://qastaging/~tinchester/gnome-activity-journal/new-button-implementation

1. new-button-implementation
2. Dependent merge proposals