Merge "Removing dependency on PackageInfo in IconCache" into main