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

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