[gtk] (7 commits) Non-fast-forward update to branch matthiasc/for-master

[Matthias Clasen <matthiasc src gnome org>]

The branch 'matthiasc/for-master' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  c06c87a... gtk-builder-tool: Simplify <style>
  202b675... widget-factory: Simplify the ui file

Commits added to the branch:

  e77eaa0... macos: handle NULL surface when creating GL context (*)
  18c9727... Merge branch 'wip/chergert/fix-4279' into 'master' (*)
  82b5326... gtk-builder-tool: Simplify <style>
  9e20b91... gtk-builder-tool: Simplify more
  d7b6830... widget-factory: Simplify the ui file
  9c4fb24... Simplify our ui files
  fa0ad43... a11y: Simplify atspi context a bit

(*) This commit already existed in another branch; no separate mail sent