Merge "Migrate NetworkOperatorPreference to Kotlin" into main