[Bug 226562] Merge Review: xkeyboard-config