Merge "Fix deadlock in timer_delete."