Port Greybird's Gtk3.8 fixes to Bluebird
Port notebook-fix from Greybird