Merge branch 'bug/exit-fullscreen-mode'