Merge "Add video view control" into devel/master