Merge "Clean up VideoEditorPreviewController class part one:"