Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
Fix the size of VideoPlayer is incorrect on android.
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
Merge pull request #7052 from gin0606/videoPlayerScaleIssue

Fix video scale issue in iOS
[ci skip]
Merge pull request #7597 from Dhilan007/v3-video-android

Fix the size of VideoPlayer is incorrect on android.