[Bug 226083] Merge Review: libXrandr