Merge proposals dependent on lp://staging/~vthompson/ubuntu-terminal-app/testing-fix

lp://staging/~vthompson/ubuntu-terminal-app/testing-fix has no merge proposals.