Merge "Change color of expand button on notif groups" into sc-dev