Merge "Fixing notification dots settings not updated properly" into sc-dev