[image_view2] refactor to se smaller function
Merge remote-tracking branch 'refs/remotes/origin/master' into refactor-to-smaller-functions
Merge remote-tracking branch 'refs/remotes/origin/master' into garaemon-refactor-to-smaller-functions
Merge pull request #654 from garaemon/refactor-to-smaller-functions

[image_view2] Refactor to use smaller functions