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

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