Merge "Check for null pkgList in fixSeInfoLocked()" into pi-dev