Merge "Updates to NLS notif type filtering" into sc-dev