Blue-Submarine GTK3: backport improvements from GTK3-3.14 branch