Fix #2576

Make use of OnSwitchTo method to reset the viewport to fullscreen - fixes #2576