I don't quite like the states in-between commits (although I understand their motivation)
I can squash or rearrange the commits if you want. The commits were primarily separated to allow immediate merge, without waiting for GTK 3.24. But I believe that it is now almost certain, that next release will require it, so it is not really needed anymore.