Merge "ISurfaceComposer: rename isColorManagementUsed()"