Merge "Support QosCallback with UDP socket"