Merge "Prevent apps from uninstalling packages that are not installed by them." into nyc-dev