Merge "Converting BaseIconCache to kotlin" into main