Merge "[pm] fix NPE in assertPackageStorageValid" into main