Merge proposals dependent on lp:~3v1n0/indicator-messages/clear-notifications-on-secondary-activate

1. clear-notifications-on-secondary-activate
2. Dependent merge proposals