Merge "sdm: Update color modes appropriately for pluggable displays"