Merge "(Automated Tests) Added Video view test to increase coverage" into devel/master