Merge proposals dependent on lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-update-shadereffectsource-based-shapes

1. ubuntu-ui-toolkit-update-shadereffectsource-based-shapes
2. Dependent merge proposals