Merge "Support SurfaceView synchronization."