Merge "Add shared models for device settings" into main