Backport from mainline. Changes can be applied cleanly. -------------
Commit messages: - Backport 0eb4d7196099d817cc6467985b882242845bdd2e Changes: https://git.openjdk.org/jfx22u/pull/25/files Webrev: https://webrevs.openjdk.org/?repo=jfx22u&pr=25&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8329705 Stats: 299 lines in 4 files changed: 299 ins; 0 del; 0 mod Patch: https://git.openjdk.org/jfx22u/pull/25.diff Fetch: git fetch https://git.openjdk.org/jfx22u.git pull/25/head:pull/25 PR: https://git.openjdk.org/jfx22u/pull/25