Merge "VideoEditor:Inconsistance defines:Issue ID:3419090"