Fixed the video player not showing on iOS if it's not in FullScreen mode
Merge pull request #7705 from zii/patch-1

让replaceScene更安全
fix conflict
Merge pull request #7715 from minggo/fix-video-player

Fix video player