Merge "Fix race condition in DeviceConfig CTS" into rvc-dev