Merge "ApiSetNotificationTimestamp: Make entirewatchlist more efficient"