Improved fix for correctly report image and annotation sizes in download manager, matching what the NBIA development team did(TMSI-81)