Merge "PackageManagerShellCommand: implicitly add --wait for staged installs"