Clean backport -------------
Commit messages: - Backport af8950e7ebfa1f0705cc9ef5ab50ce25571c00d4 Changes: https://git.openjdk.org/jfx21u/pull/6/files Webrev: https://webrevs.openjdk.org/?repo=jfx21u&pr=6&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8313711 Stats: 637 lines in 88 files changed: 320 ins; 150 del; 167 mod Patch: https://git.openjdk.org/jfx21u/pull/6.diff Fetch: git fetch https://git.openjdk.org/jfx21u.git pull/6/head:pull/6 PR: https://git.openjdk.org/jfx21u/pull/6
