Merge "remove USES_DISPLAY_RENDER_INTENTS from vts2.3"