Merge "Convert TaksView to Kotlin" into main