Chastidy

I don't think they will, of all the different showrunners there always seems to have been a common interest in keeping the Annie/Naomi frienship at the forefront.

Plus at this stage they're probably the most popular characters on the show.