ActiveNotifications: fixes for consistency

PS2: AICPfy

Change-Id: I08b4d62444104fe2ed7f8869f4bee1161ab25030