Merge proposals dependent on lp://staging/~ev/whoopsie-preferences/functional-tests

lp://staging/~ev/whoopsie-preferences/functional-tests has no merge proposals.