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

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