Merge "Update JavaDoc for SettingsProxy" into main