Merge "Convert SettingsProxy and UserSettingsProxy to Kotlin." into main