Merge pull request #3266 from jianhan-he/master

[iOS]fix waterfall crash error