Merge "Revert "[SB][Notifs] Make notification chips icon-only for now."" into main