Fixed the video player not showing on iOS if it's not in FullScreen mode
fix conflict
Merge pull request #7715 from minggo/fix-video-player

Fix video player