8207322: Backport GTK3 support on Linux to 8u

Resolved merge issues
2 files changed