Merge "Fix crash when unpairing a device which supports CSIP" into udc-qpr-dev