Merge proposals dependent on lp://staging/~codygarver/slingshot/fix-1019057

lp://staging/~codygarver/slingshot/fix-1019057 has no merge proposals.