Merge "Modified video view impl by considering visual" into devel/master