Merge "Removed out-of-date TODO in video editor performance/stress test cases"