Merge proposals dependent on lp://qastaging/xorg-options-editor

lp://qastaging/xorg-options-editor has no merge proposals.