Merge proposals dependent on lp://staging/~michael-sheldon/ubuntu-download-manager/fix-1646758

1. fix-1646758
2. Dependent merge proposals