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

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