Well they kind of spliced it in the direction , but no, it wasn’t blatantly obvious, you had to read between the lines . Look on YouTube , plenty of vids on the story mode
I knew the trailer was misdirection, called it all along, just seems like a waste to offer a big misdirection like that, then a few weeks later, debunk yourself, makes the whole trailer moment moot now.
I suppose, but the fact that the shot of Luke matches location and lighting better than the Kylo shot leads me to think it will likely be a Luke and Rey conversation, probably their initial talks about having him train her, him being reluctant.