Merge "Fixed uninstallHelperPackage() for headless system user mode." into sc-dev