Change settings' provider on provider change.

Closes #5995.
Update and get ready to start a provider on change.

Closes #5996, #5997.
Merge remote-tracking branch 'refs/remotes/ivan/bug/provider-switch-fixes' into develop