Temp revert "Active Notifications fixes:"

This reverts commit dc90d73ff68248af900f9df29151beaccccbbe88.

Change-Id: I2a28258739bad9fc752cc594d45bf34a473bf0d9
Merge "Temp revert "Active Notifications fixes:"" into kk44