Merge "Fix DeviceStateProviderImplTest formatting" into main