Merge changes Ide3354c1,I35b6b386

* changes:
  SF: Store DeviceProductInfo in DisplayDeviceState
  SF: Store DeviceProductInfo in DisplayDevice