Merge "Add image caching to ImagePreviewImageLoader" into tm-qpr-dev