Revert "Lockscreen Notifications: several fixes"

This reverts commit 57d8926b4a1194d2736cb50f8995253a050d68de.