Revert "Trimmed the branch to only the image_view sub directory"

This reverts commit 7e36070e7cdbebb7dbdd24e1b33093ee429afa5c.
Rebase from 'upstream' @ version '1.10.3'
Trimmed the branch to only the image_view sub directory