Merge proposals dependent on lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-inner-shadow-aspect

1. ubuntu-ui-toolkit-inner-shadow-aspect
2. Dependent merge proposals