Merge "Convert IconShape to Kotlin" into main