Merge "Start de-coupling NotifStats from NSSLController." into main