Merge proposals dependent on lp://qastaging/~mcintire-evan/ubuntu-terminal-app/splash-screen

1. splash-screen
2. Dependent merge proposals