xwayland: switch to master