>>231838 Smart move putting White Elephant first, otherwise I could have ended up skipping it. As it was I had to walk away twice during the end and couldn't sit through the credits.
Someone on 4chan /co/ mentioned it could have been something already planned as a follow up to Rigby going back in time, and that he'll try to undo the kiss in the last episode but go back too far. Still annoying, but better than if they just went "Yep, this is the best time to do this sort of thing entirely just to do it."