Merge "Unset cloud provider if it gets uninstalled" into sc-mainline-prod