Merge proposals dependent on lp:~vthompson/ubuntu-terminal-app/fixes-1260903-button-text-size-color

1. fixes-1260903-button-text-size-color
2. Dependent merge proposals