Merge "Fix cancellation race problem for aysnc DNS API"