Fix committed to trunk and core-8-6-branch with new fullscreen implementation.