Fixed occasional overlay-induced crash

Occured when turning on or off either overlay exactly when transitioning
rooms. Just moved the logic for changing overlays after the logic for
changing rooms. iunno.