Merge "Add countUnreadNotifications to WatchedItemStore"