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

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