I'm not so sure about that. Even though the iPhone 4 got HARD leaked, it was still such a diverge from the competition when Steve and Co keynoted it.

All of the X leaks had me wondering "I hope they have more to this because this is effectively a S8;" the keynote didn't change my opinion.