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

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