Merge "Do not return AppDetailsActivity in PackageInfo"