Merge changes Icecb8a52,Iaf301707,I3bc6d4c3,If2a4c469 into main

* changes:
  SF: Use port-based IDs for internal displays
  SF: parseDisplayIdentificationData to tests both ID schemes
  SF: Add outer EDID for display identificaiton testing
  SF: Decouple ID parsing from flags and sysprops