Merged requested to merge guido.gunther/wlroots:7c into pureos/byzantium
This makes sure we don't break existing installations
Bring back !83 (merged) and !86 (merged) and makes sure we don't break existing apps by bumping the snome. We also backport a build fix while at that.
Draft since i need to test this properly against newer phoc