wayland: merge Wayland 0.95 support from master.