Bug Fix: (No open issue)

FE:
- Fixes/maintenance in cleanup when exiting fullscreen mode. Was
clearing scope properties that had been refactored or renamed.