Merge "Dismiss PackageInstallerActivity when SimpleErrorDialog cancelled" into sc-dev