Merge "UserSystemPackageInstaller only (un)installs when appropriate" into rvc-dev