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