Merge "Fix race condition in timer disarm/delete."