Merge "When uninstalling, only kill the requested user." into nyc-dev