Merge "Move updateNotificationTimestamp callback to DeferredUpdates"