Merge "Move most User::clearAllNotifications() logic to WatchedItemStore"