Merge "Skip provider switching dialog when app sets a preferred default." into udc-dev