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

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