Merge pull request #6922 from zawasp/android_flicker

prevent flickering when opening another activity
closed #5392: add comment for unscheduleUpdate() at schedulePerFrame()
Merge pull request #6916 from John-He-928/mingw-build

Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-b...
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32

Fixing cmake project for win32
[Jenkins][ci skip] Add rebuild jobs to watchdog.py
[ci skip][jenkins]move http proxy address to jenkins configuration
Merge pull request #6934 from lmskater/add-rebuild-job-to-watchdog

[Jenkins][ci skip] Add rebuild jobs to watchdog.py
Merge pull request #6935 from heliclei/config-proxies

[ci skip][jenkins]move http proxy address to jenkins configuration
fix faults of load project on Win 32.
Merge pull request #6936 from Dhilan007/v3

fix faults of load project on Win 32.
Merge remote-tracking branch 'upstream/v3' into v3
CCUserDefault.cpp: Should not compile on Mac platform (should be using CCUserDefault.mm implementation).
Simplify BlendFunc operator< judgement
Merge branch 'v3.1hotfix' into v3

Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
only use _backToForeGroundListner when on Android
fix typo
[Jenkins][ci skip] Fix proxy address to jenkins config
Merge pull request #6940 from lmskater/fix-proxy

[Jenkins][ci skip] Fix proxy address to jenkins config
Merge pull request #6937 from wefiends/Mac-UserDefault

CCUserDefault.cpp: Should not compile on Mac platform
fix memory leak