Merge "Reset initalization state of notif entries" into rvc-dev am: 42de294ab3 am: 0290748d21

Change-Id: I301edc893fa3b4fbf9c22c5987b62773e1aa2c21