Issue #5970: Catch up bug fixes in Cocos2d-x 3.3