Merge "Migrate the usage of sUseRoundIcon to PackageParserUtils" into sc-dev