Merge proposals dependent on lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntushape-new-button-style-support

1. ubuntu-ui-toolkit-ubuntushape-new-button-style-support
2. Dependent merge proposals