MOBILE-698 contents: Improve downloads handling