Merge "Make sure notif icon has a bg" into main