Merge "Bug fixes for the create flow auto select." into udc-dev