Merge "Handle the case where launch root is not attached" into udc-dev