Merge "Fix cross profile NLS notif event delivery" into tm-qpr-dev