Merge Xephyr files with upstream.