Merge proposals dependent on lp://qastaging/~elopio/ubuntu-ui-toolkit/fix1274240-gallery-textfield_helper

1. fix1274240-gallery-textfield_helper
2. Dependent merge proposals