Merge "Prevent dial() return null in a racing condition."