Merge "Fix uninstall system updates disabling stub for single user" into sc-dev