Merge "Actually compare supported color modes." into nyc-mr1-dev