Merge "Add userId to getPackageInfo" into main