Merge "SF: Generate stable display IDs using EDID"