Fix pull request #6894 merge conflicts
Merge pull request #6984 from zhouxiaoxiaoxujian/improvement/COC-4

Improvement ImageViewReader don't necessary loadTexture when imageFilePa...