Merge "Fix webm writer"