NXP-8105: Fix override logic into the notification service