Merge "add setNotificationTimestampsForUser to WatchedItemStore"