Making sure notification counts are reset on user option changes

Bug: 47131
Change-Id: I5244ef9f7bf9d1217c0c0df6691d8cf689c47cf5
Merge "Making sure notification counts are reset on user option changes"