Merge in changes from trunk to get fixes on GTK+ for showing font picker.
Authored by: david_costanzo 2020-04-21
Parent: [r5231]
Child: [r5233]