ActiveNotifications: fixes for consistency

Change-Id: I08b4d62444104fe2ed7f8869f4bee1161ab25030
Merge "ActiveNotifications: fixes for consistency" into kk44