Merge "Update NotificationRecord of snooze even after it is cancelled"