Merge "Reorganize PackageManager dump to avoid NPE"