Merge "Log server state changes when waiting for delete"