Merge proposals dependent on lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-private-shapes

1. ubuntu-ui-toolkit-private-shapes
2. Dependent merge proposals