Merge changes Idcd4808c,I108ccb75,I446e5795,Idae2d3d9,I2a81817c

* changes:
  SF: Separate out display color handling
  SF: Separate out render surface code
  SF: Move DisplaySurface into CompositionEngine
  SF: Move state out of DisplayDevice to a new Output class
  SF: Setup CompositionEngine::Display