Update against current QtWayland upstream

This just does a merge from upstream/dev. The only new commit is 15876b4.