Merge "remove feature flag for DeviceInfoSettings in Settings"