Merge "Make PackageInstaller prompt properly"