Merge "[Notif redesign] Align expander vertically in one-line notifs" into main