Merge "SF: Add EDID-ID Fabrication Logic" into main