I think the Canadian promo was just being sneaky by putting those two clips together. If you look closely, you’ll see that Emma’s clothes are different.
Or maybe that’s just me hoping. I really don’t want him to know. Not just because it will up the drama, but because if he did know and ran that would be kind of unforgivable. Besides, if he is Bae, I can’t help but imagine he would have inherited Rumple’s paternal streek. I mean, besides that one moment of cowardice, you have to admit that for all his faults Rumple was a good dad.