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

This reverts commit 5167c7c4a9e6f19beb8bba463db2e9f5c73619f5.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the image_view sub directory