Merge "VideoEditor: Issue ID:3396697 Missing Files added"