Merge "Fix issue where call timeout is triggered for canceled calls." into main