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

This reverts commit 398944f9c2764e26f8c5f21405d1580e5ac0d2f8.
Rebase from 'upstream' @ version '1.10.2'
Trimmed the branch to only the image_view sub directory