Merge proposals dependent on lp://staging/~chasedouglas/xorg-gtest/fixes

lp://staging/~chasedouglas/xorg-gtest/fixes has no merge proposals.