Revert "Lockscreen Notifications Fixes"

This reverts commit 9f2d2fe5b044fb5795939ed584a5f335cffe873a.