Merge "display: Add flags for colormanagement"