Merge proposals dependent on lp:~jeremywootten/pantheon-files/fix-1605930-filechooser-click-behaviour

1. fix-1605930-filechooser-click-behaviour
2. Dependent merge proposals