Most likely yes, as this isn't the complete fight.
Yes, the player will have to win her again in the next update. Because at the moment that switch is not saved in the save data.
