Clean backport of JDK-8336940 and JDK-8336939. -------------
Commit messages: - Backport b88ac0495650bd033ba11e3131e9bffc517872eb Changes: https://git.openjdk.org/jfx23u/pull/14/files Webrev: https://webrevs.openjdk.org/?repo=jfx23u&pr=14&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8336940 Stats: 24630 lines in 329 files changed: 13062 ins; 6878 del; 4690 mod Patch: https://git.openjdk.org/jfx23u/pull/14.diff Fetch: git fetch https://git.openjdk.org/jfx23u.git pull/14/head:pull/14 PR: https://git.openjdk.org/jfx23u/pull/14
