Revert "[1/2] Lockscreen Notifications fixes"

This reverts commit b6d7c635e3bada14e323996b14b9263a994725ab.