Merge "Handle normal call when satellite is enabled" into udc-dev