Merge "Nullability fixes for Kotlin 2.1" into main