correctly manage video sync state (2.0 branch)