Considering that I personally don't think Michael Cole has really ever stopped being "annoying", I would say yes. The whole thing most likely stemmed from people realizing that Cole was annoying and making a big deal out of it, so they decided to just roll with it and make him go over the top with it. Plus it was a big moment for them, a big thank you storyline. Which is much better than the alternative of them giving either of them a thank you title run