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

This reverts commit 7ae108b178b6c7f30a8bd1d6cd5032393ab332ed.
Rebase from 'upstream'
Trimmed the branch to only the image_view sub directory