Merge "Wait for driver country code update before starting SoftAP" into udc-dev