Merge "Re-add test for replacing surface during video playback."