Merge proposals dependent on lp://qastaging/~artmello/ubuntu-ui-toolkit/ubuntu-ui-toolkit-fix_1659532

1. ubuntu-ui-toolkit-fix_1659532
2. Dependent merge proposals