None of the clues matter unless the RJ story comes back. It looks like a commercial decision to scrap that storyline was made, to try and cater to the majority. There were clues and plans, but if they're going to revisit it, it's definitely last double-episode material as they care too much about ratings.

That double episode is pivotal to the series. Noone wants a box set of Jisbon. If anything, season 7 will NEED
to engage and explain the RJ storyline, so fans worldwide revisit moments from every past season. This is what compels the average viewer, even Jisbon fans, to REWATCH.

Warner Bros knows this, that's why it was so important to get in one final season, so they could give a clean legitimate finish to the RJ Arc.