Merge "graphics: improve PRESENT_OR_VALIDATE_DISPLAY support"