Merge proposals dependent on lp://qastaging/~canonical-platform-qa/ubuntu-ui-toolkit/fix1384703-flickable_infinite_loop

1. fix1384703-flickable_infinite_loop
2. Dependent merge proposals