Backport 8224636 to OpenJFX 11

[Johan Vos]

Hi Kevin,

I request permission to backport JDK-8224636 to OpenJFX 11 (11-dev).
The patch applies clean.

- Johan