Clean backport of JDK-8318387. -------------
Commit messages: - Backport 606878af275dbad551a10653c92a2deef61c10cd Changes: https://git.openjdk.org/jfx21u/pull/33/files Webrev: https://webrevs.openjdk.org/?repo=jfx21u&pr=33&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8318387 Stats: 45668 lines in 438 files changed: 19431 ins; 18936 del; 7301 mod Patch: https://git.openjdk.org/jfx21u/pull/33.diff Fetch: git fetch https://git.openjdk.org/jfx21u.git pull/33/head:pull/33 PR: https://git.openjdk.org/jfx21u/pull/33
