Merge "Make getDeviceSettingsConfig non-oneway" into main