Merge "Added video edit test" into jb-mr2-dev