Merge "Disable all providers if none selected" into udc-dev