Bug 992383 - Notification removal triggers error
Merge pull request #18023 from mikehenrty/bug-992383-waitlockscreen

Bug 992383 - Notification removal triggers error