Merge "Swap parameters in QosCallback#registerQosCallback"