Update against current QtWayland upstream

This just does a merge from upstream/dev, with a few commits on top ported over from mer-packages. The only really new commit is 15876b4.