Merge "Refactor display color transforms" into nyc-mr1-dev