Merge "Delete notif history files at the right time"