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

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