Merge "Fix for issue 3431967: Memory leak from video editor engine"