Revert "Lockscreen Notifications: some fixes"

This reverts commit bd240ebe45fc0c8e440582622ea7935320deedc7.
Revert "Lockscreen Notifications [1/2]"

This reverts commit 22b2e55e8b4472a8f37f6bf4db301183a59be16c.

Change-Id: I81f518656ae4fe0033b5ad4369f6d62e3385382d