Merge "Removing USES_DISPLAY_RENDER_INTENTS check in ComposerClient.h"