Merge changes Id05d2eac,I3d8bcbf8 into sc-dev

* changes:
  SF: Add DisplayDevice::initiateModeChange
  SF: Store display modes in DisplayDevice