Merge "Better handle uninstall cases." into sc-dev