Star Wars Jedi: Survivor trailer finally shows fan-favorite Merrin