Merge changes Ie0e5ffe3,I9c73b433 into sc-v2-dev

* changes:
  SF: Move desired active mode management to DisplayDevice
  SF: add PhysicalDisplayId to DisplayMode