Merge "[Notif redesign] Bigger "small" icon in base expanded notif" into main