Merge proposals dependent on lp://staging/~zeitgeist/activity-log-manager/smaller-exclude-icons

1. smaller-exclude-icons
2. Dependent merge proposals