Merge proposals dependent on lp://qastaging/~mcintire-evan/ubuntu-terminal-app/fix-ubuntu-colorscheme

1. fix-ubuntu-colorscheme
2. Dependent merge proposals