Merge "WatchedItemStore::setNotificationTimestampsForUser(): Allow clearing timestamp"