Merge "Add dialog for enabling a provider in settings" into udc-dev