Apple-Samsung face up again