Merge changes Iea048eaa,I5c246571 into nyc-mr1-dev

* changes:
  Add support for multiple color modes
  Remove unused DisplayInfo structure