Merge "VideoEditor: Fixes Issue ID:3448077"