Merge "Clear archive state when the deletion is not successful." into main