Merge "Update ShadowDevicConfig" into main