Merge "[ECM] Add ECM allowlist to SystemConfig" into main