Merge "[Notif redesign] Expander: always show number for groups" into main