Merge proposals dependent on lp://staging/~fboucault/ubuntu-ui-toolkit/text_field_fix_unit_tests

1. text_field_fix_unit_tests
2. Dependent merge proposals