GTK3 migration - preferences dialog upggraded to Grid Layout
Merge commit '6e3ff5cc4f34feb1034b479d83cf79b97d545094'
Use GtkGrid on GTK+3 and GtkTable on GTK+2 for the preferences dialog.