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

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