Merge "VideoEditor:IssueID:3396697: Updated Preview Test code"