Merge "Fix missing break when parsing allow-package-shareduid" into main