Merge "Attempt to reload providers when selected provider is available but unloaded" into udc-qpr-dev