Fix to crash when skipping cinematics
Merge remote branch 'luis/JediAcademyLinux' into final-build-v1