Merge "Add BeforeResetNotificationTimestamp hook"