Merge "Increase test timeout for waiting DeviceConfig" into main