Merge "Notif redesign: Improve the way we display the work badge" into main