Merge "Reset surface after a seek. For bug 5189069."