Merge proposals dependent on lp://qastaging/~kamstrup/unity-lens-files/fix-timerange-for-downloads

1. fix-timerange-for-downloads
2. Dependent merge proposals