Merge proposals dependent on lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-remove-ubuntu-shape-proxy

1. ubuntu-ui-toolkit-remove-ubuntu-shape-proxy
2. Dependent merge proposals