Merge "Removed the video sync line when there is no video." into main