Merge "Notifs need small icons to be in the notif history" into sc-dev