Merge pull request #17630 from steveck-chung/bug-983631

Bug 983631 - [Messages] After deleting a message thread the notification persists forever. r=julienw