Merge proposals dependent on lp:~jeremywootten/pantheon-files/fix-select-when-scrolled-regression

1. fix-select-when-scrolled-regression
2. Dependent merge proposals