Merge proposals dependent on lp://qastaging/~aacid/ubuntu-ui-toolkit/fix-borderimage-regression

1. fix-borderimage-regression
2. Dependent merge proposals